bitkeeper revision 1.1159.1.446 (41a48ee42Omqs3zoJHTZPhLlPx5LUw)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 24 Nov 2004 13:38:44 +0000 (13:38 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 24 Nov 2004 13:38:44 +0000 (13:38 +0000)
commit80e6b45fc89d846d264c351a48c2fcdbf53957b0
tree163e4afb463954fd77b847e68a315f799db7e312
parent4e3b6f94e9ab9c694a0b3316d9b0a5a03979d717
parente5e3ee44f2e777dcfb213b590e77c840b68ffb6a
bitkeeper revision 1.1159.1.446 (41a48ee42Omqs3zoJHTZPhLlPx5LUw)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp
xen/arch/x86/domain.c
xen/arch/x86/memory.c
xen/arch/x86/traps.c
xen/arch/x86/x86_32/entry.S
xen/common/dom_mem_ops.c
xen/common/grant_table.c
xen/include/xen/sched.h